formatting improvements (tabs to spaces, lining up curly braces, etc.)