A little more cleanup to get inline with my latest code formatting.