Fixed space and newline issues