small cleanup to avoid code duplication...