Minor Style Changes and merge with master.