Some sprucing up of output/code