Revert "Reverted formatting changes"

This reverts commit cb68b709737c344a8e33ca1d19610a59b59eb63d.
line endings