I agree. Just refactored.