astyle & cpychecker inspired fixes