printing cleanup and improvements (maybe)