General cleanup of strings.xml and other places that could use some tidying