Fix EOL cleanups