#167 fixing PSR-2 errors