WCMIO-40 use as few as possible protected fields/methods, slight refactoring