Fix a silly typo, and other minor cleanup