Simplified and DRYed EntryState model.
Simplified and DRYed EntryState model.

jmwenda/feedbunch,jmwenda/feedbunch,amatriain/feedbunch,amatriain/feedbunch,amatriain/feedbunch,amatriain/feedbunch,jmwenda/feedbunch