Refactored Item to Cell