Changed modifier of some members