Code cleaning 1.0