Code improvement and eliminate String use

c-strings: