changed some comments and renamed some classes