refactoring
add comment