Improved code quality in tests.
Improved code quality in main.
Improved code quality in Model package.