few comments and change of title for class