Fix programming style issues in some source files