small cleanup to the code