fix comments and imports