Refactoring after green light.