Changed class variables from var to private.