Run astyle and fix some CSA whining