Also cleaned up a doc comment in the swap activity, and minor formatting of swap related strings in strings.xml.