Some Code styling improvements in API