Tidy up some elements