coding style refactorings
getter/setter/member name missmatch
comment formattings
Merge pull request #159 from wick-ed/master

phpcs re-formatting