blank values return NoneType.  Modified cleanup to return '' instead