Cleaned up diagnostic printlns