Newest cleanups, thanks to DonnaRenee Cook.