code cleanup #9