Fixes #92: removed diagnostic code; renamed a variable