cleanup and GUI version3