refactoring preview
refactoring preview