Minor cleanups, no functional changes