Added comments and default class attribute