Finish refactor. Clean up spacing for Millman.