Refactoring: indentation & phpdoc