code cleanup #2