Minor code style changes