Revert "More minor edits"

This reverts commit b3a2913c277472c51bfae33fef9df9640d445b46.