Cleanup and fix << operators