Review code and add comments