fix some indentation and newline issues