Refactored condition to make them more explicit