formatting and some more comments