that was dumb; minor refactoring