Added comment and clean up
Merge