cleanup and screenshot added