Fix EOL and whitespace issues
Fix spacing