Follow-up: simplify code