Basic Style Changes and line ending changes

[Branch: dev1.1]