Cleanup some printing / logging