Style cleanup (astyle, google)