Accessibility improvements and a little clean-up