Clean up println statements