Minor code cleanup - Implement IDisposable