refactoring, fixing