code cleaning part 1