Remove extraneous prints
Reorganization