code cleanup 2