Little cleanup...