Cleanup and commentary