Tested cleaning up formatting using astyle on some files