code cleanup
code cleanup
bug fix on uninitialised char arrays