Refactoring, started to the core...