Tidying up

Fixes issue #34