Refactored visibility handler to use decorator helper.