Cleanup, add ready wrapper