Small fixes
Cleaning
Refactoring