minor-cleanup