Added some clean for parameters, PHPDocs