Refactoring / Add comment