Improved: fewer string creations