Cleanup to get consistent code.