Cleanup and add right-click to reset