Refactoring, cleanup
Further consolidation, remove termination bool