Refactored class member visibility