Small changes
Refactor