style fixes

* 2 space tabs
* simplify conditional logic
* remove parens for function definitions that take no arguments
removed in subsequent commit