Fix trivial
Refactor