remove some more code duplication