Coding style cleanup