[Sixth class] Refactoring code (new comments view added)