cleaned up and compartmentalized some stuff.