Better String management
Other cleanups