Simplify code a tiny bit