Updates

Refactoring fix and comments.