Bring visibility modifiers into line with style guide