WIP: fix grading: fix var name and decomposed function