Some code style modifications