Wondershaper: Tidy-up some documentation, removed some dead-code, prettified some layout