Undid Print.cpp inconsistencies