STYLE: cleaner targetting in components