Code cleaning
Code cleaning