2nd round of the cleanup based on Jitka's comments