refactor: prettify one of the prev few commits