Start cleaning up some strings

Some strings were nagging my OCD pretty hard. This commit begins
to fix some of that. More to come...