Remove old debugging print statements and cleanup text output a bit.