Refactor on the style guide tasks