Cleanup and annotations