Minor cleanups
iminor restructuring