Updated formatting and line endings