more comments and formatting