Cosmetic only: simplify code