A couple quick annotations for existing code