General code cleanup to make things consistent.