Tidying

Tidying a few things