Minor cleanUp