Tidy up and beuatify.