Improve internal postpone interface
Cleanup algorithm