Closed issue #39
Fix some comments
refactoring