I'd recommend going over this file with a linter in a separate commit: 2 spaces between class and function definitions, 4 spaces instead of tabs, and a limit to 79 characters per line.