Refactored common var declarations