Fixes for PSR-1 codeing standard
Fixes #47
Fixes #48
Fixes #49