Code refactoring, improvement of data generation.