Banmeet: small cleanup changes
Commit before revert
Rohan's cleanup; Banmeet's cleanup reverted