Tidy up tree formatting