Remove unnecessary comma in define
Use shorter variable names and fix initializer for assessment data