Code cleanup. Strings should really be built using sprintf() and not by inefficient .-concatenation