reorganized, cleanup