Feature/fixing refactoring