More visibility refactoring