Tweaks: shadow variable, formatting