Refactor Boolean returns