Switched unneeded protected members to private