Address some style problems found by static analysis