Updated classes to be easier to read