replaced variable, minor cleanup