Changes and Code Formatting