commenting and some changes has been done in Assignment-4, still refactoring is left