PHPDoc
Code style refactoring