More refactoring ready to start on the next development phase