fix comments and style issues