Refactoring underscore