cleans grading code by adding wrappers