Line wrapping and phpdoc fix