Clean up, update phpdoc.
Merge pull request #173 from DariusIII/codecleanup

Clean up, update phpdoc.