just some minor clean-up related to issue #4