Fix the white spaces