Refactor visibility