Cleaned up some printing inconsistencies.