refactoring
refactor 2