Fix missing import
Optimize toString