Change to variables from public to private