Accessibility refactoring