Tidy up 21 and 34