fixed code changes as per comments made in the code review and committed previous changes which include minor improvements conflic resolve and deleting unnecessary files