Remake mutate and recalc to functions