Cosmetic Changes and Checks in place