White space correction - Part 1.
White space correction - Part 2.