- code clean up
 - increase code coverage to over