minior changes + Defining classes part 2