[cogenda-web] - Code refactor