Remove some method code duplication