Minor cleanups while I'm looking at the page