Simplify logical structure