Refactor one comp