more reformatting (tabs to spaces, lining up curly braces, no line wraps, etc.)