When I enter classroom lesson go on . сделать в (past simple and continuos ). When he...

Question

When I enter classroom lesson go on .
сделать в (past simple and continuos ).
When he come back workers already clean pavement .сделать в .(past simple and past perfect )

Answer 1

When I entered classroom the lesson was going on.
When he came back workers had already cleaned pavement.

Answer 2

When I entered classroom lesson going on