[FIX] fix shadow warnings
[FIX] fix shadow warnings, cleanup