Refactoring names and add docblock comments.
Refactor class name and update inline comments.
Update comments.