Fix compiler warnings, whitespace

[geeksmith]

Cleaned up gcc errors regarding protected conditionals, indentation, and parenthesis around statements protected by a macro to make the code more readable. Also stripped some trailing spaces.

[jurobystricky]

Thanks