Minor clean up, String.format is not very efficient as it compile the pattern on every call