- Small refactor