changing variable name and fixing expression