Minor changes according to Gama11's feedback