Agreed. Refactored.