removing some test statements and adding some comments