Continued refactoring for completeness

## Ready State: Yes