Remove comments, add scope+desc