some classification work and cleanup