Simplified things

Here's an example of how you could tidy things up if you want to, feel free to use it in any way you like (or not at all) or ask me if you have any questions :)