Fixed file line endings. Refactoring.