Fixing whitespace
Major code cleanup on an old solution