general refactoring
refactor