Simplify code further