cleanup and annotation