Cleaned up template file.  Make result set closable
Updated version.  Reverted class member change