Tidy up of Dispose view