fix comments and style