Code

fix shadow warnings