Little changes
Refactor