Fix some line breaks and indentations