Jeremy, Nikesh | refactoring approved by Sam