cleanup - class restructure