(Cal) Some minor printing optimiziations