formating, fixed errors regarding variable names