more conclusion refactoring