Little cleanup done