Change code style to PSR-2
Fix some small issues
Merge pull request #259 from phpbrew/enhancement/cleanup-code

Change code style to PSR-2