Tidied code

I'm just enjoying playing with the commit button..