Style Changes and Minor Updates