Bug fix
Whitespace cleanups (yes, I do care about that)