More work on the Wiki cleanup rules
A little more Wiki cleanup work, starting to look good