Changed variables to "private"