Small signature refactoring