annotations and cleanup