refactor filling-jars