changes you didn't even ask for

unless you can think of a good reason to make it a singleton I would avoid
the rest of the changes are silly