simplify class pre Eli's code review