Little cleanup ...