Cleanup and annotation