simplify return statement
change variable names