Small refactor before getting going again