- code cleanup #2