Some refactoring is made