Some tidying up

2 jobs for master