Better phpdoc and method naming