Whitespace / line-ending changes