code cleanup #1