Cleaned up after merge.
Tried to clean up print statements