Clean up some int to string conversions