Cleanup
Introduce more slicing instead of stringaddstub