Cleanup, Improved API