* cleanup * Cleanup StringUtils * Cleanup CommandBuilder * Cleanup CommandBuilder * Use 'String::replace(char, char)'