Code Cleanup with codemaid
Fixed IDisposable