Tidied up PHPDoc comments