CODE: More sprintf cleanup