improved model organization