No big changes. Small refactoring