Cleaning up code

Removal off debugging print statements and other minor cleanups