Adding some comments and renaming some classes