fixes refactoring