fix + refactoring