Ensure files are properly closed via context manager

Theodore Changrequested to merge
tlc/resouce-leak-file-handles into develop

Merge request reports