Code cleaning
fixing warnings
Fixing warning
Merging