Minor changes & tidy up.