Correct variable declarations for clean building