Fixed spacing/newline issues