some code reshuffling (like in https://github.com/cms-ts/WbAnalysis/commit/2f8f3b7df49c18adf2d4ce26631a1620b9df1982)