Cleaned up phpdoc to reflect refactors