Documentation updated
Better comments