Got bored and decided to tidy up the engine a little bit. I know it's not perfect... It's my first attempt