DOC/FIX Address @arjoly's comments