code cleanup 1