Cleanup shadows variable warnings