removed duplicates
fixed phpdoc
renamed