Major screenshot cleanup