* Little cleanup