Small improvement and doc update