refactoring dst