Cleanup for white spaces