Massive visibility refactoring