minor changes
Refactoring
Refactoring