cleared some comments