code cleanup per rxin comments