Added some comments here and there