got rid of unnecessary print statements
merging changes