Do some neatening up