Refactor to fit PSR-2 PHPDocumentor standards