Cleanup, little API change