WINTERMUTE: Fix formatting and tidy up a little