rest refactoring 9th