Refactoring: move ooze prevention, wipe and avoid crossing perimeters into nested classes for better isolation