Cleanup
phpdoc update