fix / refactoring