some other refactoring