phpdocs and refactors