Getting a little insane with the code cleanup, I think that's good enough.