Small refactor (visibility of some properties)