Small refactor and change