Removed useless if/else
PHPDocs
Cleanup