Issue #19 Fix PSR1 PHP-CS recommendations