Minor cleanups - more to come