Some code style corrections