Refactor

re