cleanup to match code style