Small fix
Refactor