Minor changes & comments