__repr__ improvements