fix weird newline problem
fix whitespace issue