refactor madness: assignment->activity, exercise->step