Tidying

Some tidying up.