Commented out print statements.
Rearanged coede to make PMD that much happier