code clean-up; more unittests