refactor celldata