Some code comments have been added.
Some TODO items was added