DeclUse Refactoring - Fixed Compiler Warnings