clean up spacing
Merge pull request #74 from bifek/cleanup

clean up spacing and bracing according to PSR-2