Misc tidying
