refactor 1
refactor