cleaned some comments
merge