code cleanup #3