cleaning code, part II