Make some members private, that were set to public for testing earlier.