changed: Simplify code