code cleanup number 5.