style fixes

* 2 space tabs
* simplify conditional logic
* remove parens for function definitions that take no arguments
I didn't read deep enough into it, I was just changing it to a one line. I can go through and prune the function calls too.