remove whitelines
a lot of these will never hit the decorator
a few fixes for coverage