Small refactoring, each_with object not really needed here