Minor
Refactoring