FIXUP Minor refactoring
Handle whitespace and NULL closing dates