and I follow your advice to refactore using more formats