Formatting Changes and data clean