Code cleanup, make Dispose() sealed