Small refactor, move things around