Clean code fixes; Reformat some XML