Refactor with underscore