Tidied up the code under supervision

Hey Ryan,

Here's the code we worked on together.

Cheers,

Pete