Minor formatting
Fix warnings for shadowed local variables

Signed-off-by: Mattt Thompson <m@mattt.me>