cleanup, merge snprintf calls