Make a global substitution instead of a repeated one
Update comments