Small cleanups to some printing files