Merge "init: cleanup some string usage"