Small refactor #225