consistent naming of comb and seq definitions, clean up imports