Start of final refactoring steps