Cleanup, thinking in code for next steps.