cleanup and add screenshot