Refactor Item Controller