Fixed a naming issue and removed debugging code.