[FIX] fix shadow warnings, cleanup