Refacto and cleanings
refactoring
refactoring renaming