Minor cleanup to code style