Coding style improvements.