Minor changes according to comments