code tidies, incl: paren pruning, comments, ranges