Ace and Aw tidy up