Changed variables to be private