Tidying up
Fixing things