fixing style, var name & PHPDoc