Tidied up comments and controller methods.