Cosmetic changes
Solving some warnings
Cosmetic
Little refactor