Исправить предложение The boy drank cold and dirty water yesterday

The boy drank dirty and cold water yesterday.

Yesterday the boy drank dirty and cold water.

Вчера мальчик пил грязную и холодную воду.

The subject of this sentence is the boy. In affirmative sentence usually subject is at the beginning. The predicate is drank. The sentence is in Past Indefinite.  The keyword is yesterday. Yesterday is one of the keywords of Past Indefinite. The sentence is in Active Voice.

Dirty and cold water was drunk yesterday by the boy.

Yesterday dirty and cold water was drunk by the boy.