Tidy up of Spades and Velvet.