HUGO: Reduce the scope of some variables