Refactoring and update comment