Refactor - Simplify condition