Some progress in refactoring and better code quality.