Refactor
Remove duplication