Code cleanup
Fun with line endings