Little fixes
Little change
Refactoring
Refactoring