Refactored array,variable naming