Fix line endings & refactoring oversight