code cleanup to avoid warnings