minor refactoring, this should be easier to get