Compartmentalized code to appease Naveen's OCD