Refactor/utils json