Items controller refactoring