some more comments and style changes