Coding style improvements