Some minor coding style fixes:
-space before opening brace of function
-wrap some long lines
-change some identations from spaces to tabs