JakeSteam Tidying up code