code cleanup number 4.