made slight adjustmets and refactored Lauriane's comment on the code