Tidy-up <Key> and <Body> tags