fixing all inline comments from sbesson