refactored cells content