Cleanup, adding phpdoc annotations