Adding phpdoc tags & Refactoring