Refactor of styles in related tasks