Cleaning
More annotations a propos #68