Refactored variables declarations