Changed variables to private