Little cleanup in the Pool