Minor changes
Refactoring
Refactoring