Some phpdoc and formatting