Coding style corrections