Whitespace and Linter NitPicks

Removed a bunch of commented out code that won't be coming back as is. Added in brackets on single line if statements because they rarely stay single line. Clean up some whitespace issues.