Removed unnecessary line endings and TODO comments