Fix operator <<
Cosmetic changes