Cleanup from linimon's patch along with some improvenating of Englishification.
PR: 213060 Submitted by: linimon