Code changes & comments added