Fixes of indentation and line endings