syntax and code format fixed