Minor changes as per brian's feedback