Updated comments throughout