Refactoring and avoiding style bleed out