underscore refactored.