More cleanup of prints