Refactoring added comments