Add comment && code refactor