P6- and triangle-free graphs revisited: structure and bounded clique-width