Minor
Refactor