pep8 and white-space cleanup
Use NOT_GIVEN marker instead of None