Small code cleanup to make it easier to read.