Code cleaning 1