refactoring results to be a bit more rustic