Style cleaup

Whitespace, bracket styles etc.