phpdoc and whitespace fixes