fix; refactoring