some code clean-up

I have also learned that lettuce tests are not picked up by coverage