- refactor code