Reformatted code to my standards, since I now manage the project. Three space tab. Next-line braces, just take a look.