String changes and Coding convention fixed