more clean up of println