Formatting Changes and small code merge