Refactoring and comment