Refactor
Small fix
Refactor