Updated my classes with comments