simplify model classes