Cleaned up some resource leakage from not closing Scanners