and removing some extra print statements