better presentation and more comments