Code styling improvements