cleanup to make more readable