Move check for disabled logic to helper method