Refactor Assessment.sol to be more explicit about the Stages of assessments and use functions where possible