Refactoring added comments.