code cleanup, part II