m
Minor changes after feedback