more bad refactoring