Refactoring.  Adding disclosure controls