Minor cleanups
resolved