Clean up cell state and add comments.