Switched some class variables to private