Minor cleanups

Authored by cordlandwehr on Jun 15 2019, 10:03 AM.