simplify class structure