Remove outputting of wites, tidy up table