code cleanup number 2.