Code cleaning 2.