Improving of the code quality, and more unit tests.