Applied Antonty's linguistic fixes