Code cleanup to unify style.