Minor code style modifications