Made comments throughout