Refactor components.