Refactor: some specs and more congruent return types