Removed stupid comment
Tidied up some code to categories