Refactored looks better