Code cleaning 2
Code cleaning 3