City claims progress in reforming water department