refactored variables and arrays names