Refactoring is complete. Tests on the real data are required