- major code cleanup