simplify comments, fix accidental global