Which of the following sentences is grammatical or better?

----------------------------------------

From 1999 to 2002, when he was studying in xxx Schoo, I worked as his math teacher and class tutor.

From 1999 to 2002, he was studying in xxx Schoo, and I worked as his math teacher and class tutor.