Fair enough. Refactored.