Small refactor 2