code cleanup 3