Cleanup, extra whitespace removal.