Made stringier
Cleanup