Code cleaning part 3