Tidied up comments, removed whitespace