Just some refactoring to get ready for next steps.