Remove some more code duplication