screenshot cleanup and consistency