Adding Comments and cleaning up Part-1