More refactoring REST tutorial