Clean up, update phpdoc.