Some refactoring was finally made