refactor: more logical functions grouping