Rohan's initial changes (cleanup and renaming)