Refactor cell to content