code cleaning part 2