Final tidying

Sorry @sbesson , spotted some more stuff!