rest refactoring 7th