Simplify code a bit, no functionality change.