Revert "Revert "More minor edits""

This reverts commit 9e2178c211af41d60d246b1e0224e37e47e356c2.