refact variable names