Cleanup white spaces