clean-up; minor changes and corrections

https://mediawiki.org/wiki/Special:Code/pywikipedia/11753