Code Refactor of Add Assessments