Code cleaning
Code cleanup
Code cleanup