refactor: use named returns for some funcs

This should make the functions easier to use, harder to confuse the return values with the same type.