Clean up phpdoc and constructors