Tidy up overall