Removed some trailing spaces
Normalize line endings