Added some comments / reformatting