Tidy up of wpf application #23