SQUASH ME: line break related fixes