Refactoring
Update comment