Cleanup based on phpdoc output and file review