Small refactor #2