Readability improvements

Hi Charlie,

Cool project!

I quickly went through the code to familiarise myself with it and decided to make some minor changes to improve the overall readability so that it is easier for people to navigate around it. Let me know what you think!