Refactor to readable condition