cleaner underscore usage
merge