be stricter

and avoid capturing if not necessary