- increase test coverage and code clean up