Cleanup whitespace take 2