visibility refactoring