Some reformatting  and tidy up.