Minor change - refactoring