Small refactor
Small refactor