Comment after refactoring