Minor cleanup

Some very minor cleanup.