clean up + consolidate paren finding