Minimal refactoring

Testing, testing, 123