Minor cleanup

Mostly just a conventional change.