Some much needed formatting

Spaces to tabs
Inline tabs to spaces
Spaces between parenthesis
etc