Added some comments, removed some comments