Changed varibles to be private