Added comments and few small changes