Minor code cleanup, use std::to_string instead of stringstream