Fix and clean small things from review