Minor changes
Code cleaning