rest refactoring 8th