Cleanup and fixes for typos and foodcritic.