Output cleanup after refactor and initial work toward death before marriage check