Fix Code styling issues