Merge "Minor refactoring on String formatting."