Enrolment planner optimsation

Optimised enrol-planner by getting rid of getter methods; slight tweak
to unit model validation