Refactored as told