class structure cleanup