cppcheck inspired cleanups
FORMATTING ONLY; astyle -A10