code cleanup - duplicate requires moved into class