CODE: More code cleanup (sprintf)