simplifications
moved some util functions into Hunt model