Code cleanup and augmentation of accept as is warning message