Code cleaning 3.