Improving code structure and test suite.