Refactoring model to separate item from cell