Minor changes after feedback