removed assignation as there is no return from setter here
Fixed typos
Fixed PHPDocs
Fixed minor whitespaces
Fix merge conflicts with pborreli/typos